From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 10 Mar 2017 15:20:25 +0000 (+0100)
Subject: main: Use GBusNameOwnerFlags to specify flags
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~460
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8f8e512b3714d36e57406c47faf9c5c966fcd137;p=gnome-shell.git

main: Use GBusNameOwnerFlags to specify flags

We are still using DBUS_NAME_FLAG_REPLACE_EXISTING from dbus-glib
in some places (whose headers are drawn in via telepathy-glib).
As both GIO and dbus-glib use the values that will end up being
sent on the bus, the define and enum value are interchangeable,
but it's clearly better to consistently use the library that is
explicitly included.

https://bugzilla.gnome.org/show_bug.cgi?id=771721
---

diff --git a/src/main.c b/src/main.c
index 78a300d28..44fdd832c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -139,7 +139,7 @@ shell_dbus_init (gboolean replace)
 
   request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
   if (replace)
-    request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
+    request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
 
   shell_dbus_acquire_name (bus,
                            request_name_flags,
@@ -169,7 +169,7 @@ shell_dbus_init (gboolean replace)
                             NULL);
   /* ...and the on-screen keyboard service */
   shell_dbus_acquire_name (bus,
-                           DBUS_NAME_FLAG_REPLACE_EXISTING,
+                           G_BUS_NAME_OWNER_FLAGS_REPLACE,
                            &request_name_result,
                            "org.gnome.Caribou.Keyboard", FALSE);
   g_object_unref (bus);